rustc: collapse relevant DefPathData variants into {Type,Value,Macro,Lifetime}Ns. #60525
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rust-highfive
added
the
S-waiting-on-review
This was referenced May 3, 2019
eddyb
force-pushed
the
namespaces-not-kinds
branch
from
cb610a0 to
60f1944
Compare
eddyb
changed the title
petrochenkov
reviewed
May 4, 2019
| | DefPathData::ClosureExpr | ||
| | DefPathData::Ctor => Namespace::ValueNS, | ||
|
|
||
| DefPathData::MacroNs(..) => Namespace::MacroNS, | ||
|
|
||
| _ => Namespace::TypeNS, |
There was a problem hiding this comment.
Nit: could you use an exhaustive match here.
There was a problem hiding this comment.
Intentionally not using it because this are not really in the type namespace.
Maybe I should've made this function return -> Option<Namespace>, but it's really just a private hack.
petrochenkov
reviewed
May 4, 2019
| ctor: variant.ctor_def_id.map(|did| did.index), | ||
| ctor_sig: None, |
There was a problem hiding this comment.
Not sure how this worked before.
petrochenkov
reviewed
May 4, 2019
| @@ -157,13 +158,27 @@ crate fn program_clauses_for<'a, 'tcx>( | |||
| tcx: TyCtxt<'a, 'tcx, 'tcx>, | |||
| def_id: DefId, | |||
| ) -> Clauses<'tcx> { | |||
| // FIXME(eddyb) this should only be using `def_kind`. | |||
There was a problem hiding this comment.
Do you mean introducing DefKind::Impl or something else?
There was a problem hiding this comment.
Yeah, I think DefKind should be able to describe everything with a DefId.
|
@bors r+ |
|
📌 Commit 60f1944 has been approved by |
bors
added
S-waiting-on-bors
bors
added a commit
that referenced
this pull request
May 5, 2019
rustc: collapse relevant DefPathData variants into {Type,Value,Macro,Lifetime}Ns.
`DefPathData` was meant to disambiguate within each namespace, but over the years, that purpose was overlooked, and it started to serve a double-role as a sort of `DefKind` (which #60462 properly adds).
Now, we can go back to *only* categorizing namespaces (at least for the variants with names in them).
r? @petrochenkov or @nikomatsakis cc @michaelwoerister
|
☀️ Test successful - checks-travis, status-appveyor |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
DefPathDatawas meant to disambiguate within each namespace, but over the years, that purpose was overlooked, and it started to serve a double-role as a sort ofDefKind(which #60462 properly adds).Now, we can go back to only categorizing namespaces (at least for the variants with names in them).
r? @petrochenkov or @nikomatsakis cc @michaelwoerister